bitkeeper revision 1.1159.195.1 (41a5e79b-bYOOEp0ftyINgKfwySPQw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 14:09:31 +0000 (14:09 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 14:09:31 +0000 (14:09 +0000)
commit6830ddbb09e8f2c3f695dd73afbb355f555c9f2f
tree20ddccd2438c7beadd1539e57efe3b0d2fdfbfa0
parentdd1dac3da068a7aa372f84731efeedce3079fd39
parentcb4c3deaa20908e38fe44ff65071cf459a88222f
bitkeeper revision 1.1159.195.1 (41a5e79b-bYOOEp0ftyINgKfwySPQw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp
linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
xen/arch/x86/setup.c